api/admin_views.py

@@ -1111,6 +1111,11 @@ def member_activity_contribute_welfare_unlock(request, administrator):

                     except MemberActivityContributionInfo.DoesNotExist:
              

                         return response(MemberActivityContributionStatusCode.ACTIVITY_CONTRIBUTION_NOT_FOUND)
              

                 
              

                +    try:
              

                +        welfare = MemberActivityContributionWelfareInfo.objects.get(welfare_id=welfare_id, status=True)
              

                +    except MemberActivityContributionWelfareInfo.DoesNotExist:
              

                +        return response(MemberActivityContributionWelfareStatusCode.ACTIVITY_CONTRIBUTION_WELFARE_NOT_FOUND)
              

                +
              

                     MemberActivityContributionWelfareUnlockingInfo.objects.create(
              

                         brand_id=administrator.brand_id,
              

                         admin_id=admin_id,
              
@@ -1118,6 +1123,8 @@ def member_activity_contribute_welfare_unlock(request, administrator):

                         activity_id=contribution.activity_id,
              

                         contribution_id=contribution_id,
              

                         welfare_id=welfare_id,
              

                +        welfare_type=welfare.welfare_type,
              

                +        welfare_value=welfare.welfare_value,
              

                     )
              

                 
              

                     return response(200, 'Unlock Member Activity Contribute Welfare Success', u'解锁会员活动投稿福利成功')
              

api/member_views.py

@@ -752,22 +752,22 @@ def activity_contribute_welfare_unlocking_handled(request):

                     unlocking.is_handled = True
              

                     unlocking.save()
              

                 
              

                -    # TODO: 积分相关逻辑在这里处理？
              

                -    try:
              

                -        user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
              

                -    except UserInfo.DoesNotExist:
              

                -        return response(UserStatusCode.USER_NOT_FOUND)
              

                +    if unlocking.welfare_type == MemberActivityContributionWelfareUnlockingInfo.WELFARE_INTEGRAL:
              

                +        try:
              

                +            user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
              

                +        except UserInfo.DoesNotExist:
              

                +            return response(UserStatusCode.USER_NOT_FOUND)
              

                 
              

                -    user.integral += unlocking.welfare_value
              

                -    user.save()
              

                +        user.integral += unlocking.welfare_value
              

                +        user.save()
              

                 
              

                -    UserIntegralIncomeExpensesInfo.objects.create(
              

                -        brand_id=brand_id,
              

                -        user_id=user_id,
              

                -        integral_from=UserIntegralIncomeExpensesInfo.MEMBER_ACTIVITY_CONTRIBUTION_WELFARE,
              

                -        integral=unlocking.welfare_value,
              

                -        final_integral=user.integral,
              

                -        remark=unlocking.id,
              

                -    )
              

                +        UserIntegralIncomeExpensesInfo.objects.create(
              

                +            brand_id=brand_id,
              

                +            user_id=user_id,
              

                +            integral_from=UserIntegralIncomeExpensesInfo.MEMBER_ACTIVITY_CONTRIBUTION_WELFARE,
              

                +            integral=unlocking.welfare_value,
              

                +            final_integral=user.integral,
              

                +            remark=unlocking.id,
              

                +        )
              

                 
              

                     return response(200, 'Update Member Activity Contribute Welfare Unblocking Success', u'处理会员活动投稿福利解锁成功')
              

member/admin.py

@@ -110,7 +110,7 @@ class MemberActivityContributionWelfareInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class MemberActivityContributionWelfareUnlockingInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('unlocking_id', 'admin_id', 'user_id', 'activity_id', 'contribution_id', 'welfare_id', 'welfare_value', 'name', 'phone', 'address', 'tracking_number', 'is_handled', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('unlocking_id', 'admin_id', 'user_id', 'activity_id', 'contribution_id', 'welfare_id', 'welfare_type', 'welfare_value', 'name', 'phone', 'address', 'tracking_number', 'is_handled', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('admin_id', 'activity_id', 'welfare_id', 'is_handled', 'status')
              

                 
              

                 
              

member/migrations/0047_memberactivitycontributionwelfareunlockinginfo_welfare_type.py

@@ -0,0 +1,19 @@

                +# -*- coding: utf-8 -*-
              

                +# Generated by Django 3.2.16 on 2022-10-27 10:46
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('member', '0046_memberactivitycontributionwelfareunlockinginfo_welfare_value'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='memberactivitycontributionwelfareunlockinginfo',
              

                +            name='welfare_type',
              

                +            field=models.IntegerField(choices=[(0, '实物'), (1, '积分'), (2, '虚拟')], db_index=True, default=0, help_text='福利类型', verbose_name='welfare_type'),
              

                +        ),
              

                +    ]
              

member/models.py

@@ -795,6 +795,7 @@ class MemberActivityContributionWelfareInfo(BaseModelMixin, BrandInfoMixin):

                 
              

                 
              

                 class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMixin):
              

                +    WELFARE_INTEGRAL = 1
              

                     WELFARE_TYPE = (
              

                         (0, u'实物'),
              

                         (1, u'积分'),
              
@@ -811,6 +812,7 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi

                     contribution_id = models.CharField(_(u'contribution_id'), max_length=32, blank=True, null=True, help_text=u'投稿唯一标识', db_index=True)
              

                 
              

                     welfare_id = models.CharField(_(u'welfare_id'), max_length=32, blank=True, null=True, help_text=u'福利唯一标识', db_index=True)
              

                +    welfare_type = models.IntegerField(_(u'welfare_type'), choices=WELFARE_TYPE, default=0, help_text=u'福利类型', db_index=True)
              

                     welfare_value = models.IntegerField(_(u'welfare_value'), default=0, help_text=_(u'福利数量'))
              

                 
              

                     name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'姓名')